For unconditionally using Qt::endl you'll have to raise minimum Qt5 version to at least 5.14. Did not check the other stuff, but likely better 5.15.

@a17r thanks for the review and for bringing this up. I confirm 5.14 to be needed for…

• https://doc.qt.io/qt-5/qt.html#SplitBehaviorFlags-enum
• https://doc.qt.io/qt-5/qt.html#endl

…and made the QMake project file reject Qt <5.14.0 now. It seems like the only changes not guarded behind >=6.0.0 checks so I'm leaning towards 5.14 rather than 5.15 so far. Pushed.

I've not used C++ or Qt in quite a few years, but with that caveat out of the way... Looks good to me.

I think it could be simpler in a couple of steps.
First build with qt5.15 and get rid of all deprecated warnings. Then port to Qt6.
At least all of the QMultiMap stuff should be equally good in qt5.

@tnyblom @svuorela thanks for the review!

@svuorela I confirm that (1) not supporting both Qt 5 and Qt 6 at the same time would be simpler and (2) that Qt 5 does have QMultiMap… but it does not have QMultiMapIterator and it would need a closer look how to mimic/replace it. My goal here was to keep Qt 5 in the boat for now and to add support for Qt 6 with minimum changes and have at least one release supporting both before cutting support for Qt 5 off.

@svuorela PS: With regard to QMultiMap let's make a follow-up pull request to either (a) use QMultiMap without QMultiMapIterator for both Qt 5 and 6 or (b) to drop support for Qt 5 altogether. (b) I can do, for (a) I'd be happy about contributions. What do you think?

@svuorela PS: With regard to QMultiMap let's make a follow-up pull request to either (a) use QMultiMap without QMultiMapIterator for both Qt 5 and 6 or (b) to drop support for Qt 5 altogether. (b) I can do, for (a) I'd be happy about contributions. What do you think?

I'm just a driveby reviewer, so don't get too much riled up about my ideas.

Maybe just a
#if qt6 using MapIterator = QMultiMapIterator; #else using MapIterator = QMapIterator; #endif

and then just use MapIterator everywhere...

@svuorela either I misunderstand the idea or you want to use QMapIterator with QMultiMap in case of Qt 6 but they do not seem to be compatible. I'll go ahead and merge and we can then reduce complexity…